f23f12618223d556a79c24fc061d21c95b821b52,ambari-server/src/test/java/org/apache/ambari/server/checks/ConfigurationMergeCheckTest.java,ConfigurationMergeCheckTest,testPerform,#,128

Before Change



    final RepositoryVersionDAO repositoryVersionDAO = EasyMock.createMock(RepositoryVersionDAO.class);
    expect(repositoryVersionDAO.findByVersion("1.0")).andReturn(
        Collections.singletonList(createFor("1.0"))).anyTimes();
    expect(repositoryVersionDAO.findByVersion("1.1")).andReturn(
        Collections.singletonList(createFor("1.1"))).anyTimes();

After Change


    ConfigurationMergeCheck cmc = new ConfigurationMergeCheck();

    final RepositoryVersionDAO repositoryVersionDAO = EasyMock.createMock(RepositoryVersionDAO.class);
    expect(repositoryVersionDAO.findMaxByVersion("1.0")).andReturn(createFor("1.0")).anyTimes();
    expect(repositoryVersionDAO.findMaxByVersion("1.1")).andReturn(createFor("1.1")).anyTimes();

    replay(repositoryVersionDAO);